Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream 26.04.2024 #1203

Merged
merged 16 commits into from
Apr 26, 2024
Merged

Conversation

m-dzianishchyts
Copy link
Collaborator

@m-dzianishchyts m-dzianishchyts commented Apr 25, 2024

Что этот PR делает

Мержит оффов. 0 конфликтов.
Fixes #1202.

Changelog

🆑 ParadiseSS13
add: Добавлены магические карты таро. Найти можно много где, вот здесь чтиво.
tweak: Все verb настройки вынесены в настройки игры в новой вкладке.
tweak: Во вкладке с настройками антагонистов теперь отображается количество отыгранных часов.
tweak: Убраны лишние вкладки, Game preferences теперь находится во вкладке Special Verbs стат панели.
tweak: Шейды культа теперь работают как конструкты: из них выпадают тела при уничтожении.
tweak: При соулстойне моба он не уйдет в камень, если не управляется игроком.
tweak: Синди ручки заменили обычные ручки на многих объектах синдиката в космосе.
fix: Трюк с маскировкой абдукторов/мага и растением больше не работает.
fix: Ионный заряд получил свой спрайт обратно.
/:cl:

larentoun and others added 7 commits April 24, 2024 19:38
…DOES_SLEEP (ParadiseSS13#24824)

* Updates contributing guide, removes DOES_SLEEP

* Update .github/CONTRIBUTING.md

Co-authored-by: DGamerL <[email protected]>

---------

Co-authored-by: DGamerL <[email protected]>
* Preference verb overhaul

* this too

* Update code/__DEFINES/preferences_defines.dm

* Update code/modules/client/preference/preferences.dm

Co-authored-by: Burzah <[email protected]>

* fixes + better html

* removes unused define

---------

Co-authored-by: Burzah <[email protected]>
…#24933)

* starts it

* Update magic_tarot.dm

* MORE PROGRESS

* So many thanks to Cloudbucket, for sprites

* The Work, the Art, continues.

* more changes

* pushes the Work foward. All cards done.

* and more thanks github

* adds to BSH

* tochat

* Finishes QWERTYTODO. Magic key. World smoke

* Isaac and his mother lived alone in a small house on a hill.  Isaac kept to himself, drawing pictures and playing with his toys as his mom watched Christian broadcasts on the television.  Life was simple, and they were both happy. That was, until the day Isaac’s mom heard a voice from above.  “Your son has become corrupted by sin. He needs to be saved.”  “I will do my best to save him, my Lord,” Isaac’s mother replied, rushing into Isaac’s room, removing all that was evil from his life.  Again the voice called to her, "Isaac’s soul is still corrupt. He needs to be cut off from all that is evil in this world and confess his sins."  “I will follow your instructions, Lord. I have faith in thee,” Isaac’s mother replied, as she locked Isaac in his room, away from the evils of the world.  One last time, Isaac’s mom heard the voice of God calling to her.  “You've done as I've asked, but I still question your devotion to me. To prove your faith, I will ask one more thing of you."  "Yes Lord, anything!” Isaac’s mother begged.  "To prove your love and devotion, I require a sacrifice. Your son, Isaac, will be this sacrifice. Go into his room and end his life, as an offering to me to prove you love me above all else."  "Yes Lord", she replied, grabbing a butcher’s knife from the kitchen.  Isaac, watching through a crack in his door, trembled in fear.  Scrambling around his room to find a hiding place, he noticed a trap door to the basement hidden under his rug.  Without hesitation, he flung open the hatch, just as his mother burst through his door, and threw himself down into the unknown depths below.

* nanny bag it before I forget

* Apply suggestions from code review

Co-authored-by: DGamerL <[email protected]>

* returns early

* Apply suggestions from code review

Co-authored-by: Luc <[email protected]>

* RE-RE-RE-REVIEW

* Apply suggestions from code review

Co-authored-by: Burzah <[email protected]>
Co-authored-by: DGamerL <[email protected]>
Co-authored-by: synthtee <[email protected]>

* requested changes and such

* duh

* Apply suggestions from code review

Co-authored-by: DGamerL <[email protected]>

* returns early

* Update code/datums/status_effects/buffs.dm

Co-authored-by: DGamerL <[email protected]>

* new hrefs here to troll CI :trollface:

* Update code/game/gamemodes/wizard/magic_tarot.dm

Co-authored-by: DGamerL <[email protected]>
Signed-off-by: Qwertytoforty <[email protected]>

---------

Signed-off-by: Qwertytoforty <[email protected]>
Co-authored-by: DGamerL <[email protected]>
Co-authored-by: Luc <[email protected]>
Co-authored-by: Burzah <[email protected]>
Co-authored-by: synthtee <[email protected]>
* Fix plant-disguise trick

* Resolve name collision
@github-actions github-actions bot added 💾 Изменение конфига Ф-ф-фуриор...? 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один. 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! labels Apr 25, 2024
@m-dzianishchyts m-dzianishchyts marked this pull request as draft April 25, 2024 04:06
@AyIong AyIong marked this pull request as ready for review April 25, 2024 11:01
@github-actions github-actions bot added 💿 SQL Надо править БД. and removed 💾 Изменение конфига Ф-ф-фуриор...? labels Apr 25, 2024
@m-dzianishchyts m-dzianishchyts changed the title Merge upstream 25.04.2024 Merge upstream 26.04.2024 Apr 25, 2024
@Legendaxe Legendaxe merged commit 1f357e4 into ss220club:master Apr 26, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💿 SQL Надо править БД. 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 📜 CL валиден 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Disquise Self делает тебя невидимым